x86, hvm: Fix boot of HVM guests with pass-thru devices. Cache

attributes should not be propagated for Xen-heap pages.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c
index 8eddd61538830a55b9191a949cccb16e9063c14e..1dafb13cfe96ddeb2d5918c0009ab34560761891 100644 (file)
--- a/xen/arch/x86/mm/shadow/multi.c
+++ b/xen/arch/x86/mm/shadow/multi.c
@@ -745,10 +745,11 @@ _sh_propagate(struct vcpu *v,
 
     /*
      * For HVM domains with direct access to MMIO areas, set the correct
-     * caching attributes in the shadows to match what was asked for
+     * caching attributes in the shadows to match what was asked for.
      */
     if ( (level == 1) && is_hvm_domain(d) &&
-         !list_empty(&(domain_hvm_iommu(d)->pdev_list)) )
+         !list_empty(&(domain_hvm_iommu(d)->pdev_list)) &&
+         !is_xen_heap_mfn(mfn_x(target_mfn)) )
     {
         unsigned int type;
         if ( hvm_get_mem_pinned_cacheattr(d, gfn_x(target_gfn), &type) )